dnd: Rename DND.removeMonitor() to DND.removeDragMonitor()

DND.addDragMonitor() and DND.removeMonitor() are inconsistently
named, so rename the latter.

https://bugzilla.gnome.org/show_bug.cgi?id=652730

diff --git a/js/ui/dash.js b/js/ui/dash.js
index 10f1408fafc536b76560e2d677c89a87dfd7dd6b..2b3d080d010139df59b1ae52494e7b1d3143d36b 100644 (file)
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -324,7 +324,7 @@ Dash.prototype = {
                     this._favRemoveTarget = null;
                 }));
         }
-        DND.removeMonitor(this._dragMonitor);
+        DND.removeDragMonitor(this._dragMonitor);
     },
 
     _onDragMotion: function(dragEvent) {

diff --git a/js/ui/dnd.js b/js/ui/dnd.js
index 46440d6ffe4a8d6379707713203ff1897450a6bc..33f150147c7f6d72408ea332d83f56cb33437f95 100644 (file)
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@@ -61,7 +61,7 @@ function addDragMonitor(monitor) {
     dragMonitors.push(monitor);
 }
 
-function removeMonitor(monitor) {
+function removeDragMonitor(monitor) {
     for (let i = 0; i < dragMonitors.length; i++)
         if (dragMonitors[i] == monitor) {
             dragMonitors.splice(i, 1);

diff --git a/js/ui/overview.js b/js/ui/overview.js
index ec67625445a6976826bebf93368d8f7075c56e7b..420ce3f58fb3ec0cef7aa14a397264cfdbe74a35 100644 (file)
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -220,7 +220,7 @@ Overview.prototype = {
         }
         this._resetWindowSwitchTimeout();
         this._lastHoveredWindow = null;
-        DND.removeMonitor(this._dragMonitor);
+        DND.removeDragMonitor(this._dragMonitor);
         this.endItemDrag();
     },
 

diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index 4a37b29495d93240b33f04a2473ea6f33c4e3ea9..d6012795c60c074abe9da05891df3e95c6c61ad9 100644 (file)
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -449,7 +449,7 @@ WorkspacesView.prototype = {
             Mainloop.source_remove(this._timeoutId);
             this._timeoutId = 0;
         }
-        DND.removeMonitor(this._dragMonitor);
+        DND.removeDragMonitor(this._dragMonitor);
         this._inDrag = false;
 
         for (let i = 0; i < this._workspaces.length; i++)